From 63f481aa0e942ac21b32fcc97ba03bf8762a7d56 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Sun, 2 Dec 2018 10:05:49 +0100 Subject: [PATCH] d/p: Update patches 0-7 for new release --- debian/patches/02_system_charls.patch | 16 ++--- debian/patches/03_datadic_install.patch | 69 ++++++++++++------- ...ed-OFoptional-by-introducing-OFalign.patch | 6 +- debian/patches/05_performance.patch | 4 +- .../07_dont_export_all_executables.patch | 12 ++-- .../patches/08_remove_system_processor.patch | 33 --------- debian/patches/series | 1 - 7 files changed, 62 insertions(+), 79 deletions(-) diff --git a/debian/patches/02_system_charls.patch b/debian/patches/02_system_charls.patch index d3e05a74..f38c522c 100644 --- a/debian/patches/02_system_charls.patch +++ b/debian/patches/02_system_charls.patch @@ -5,13 +5,13 @@ Author: Mathieu Malaterre --- a/dcmjpls/CMakeLists.txt +++ b/dcmjpls/CMakeLists.txt @@ -2,6 +2,6 @@ - PROJECT(dcmjpls) + project(dcmjpls) # recurse into subdirectories --FOREACH(SUBDIR libsrc libcharls apps include) -+FOREACH(SUBDIR libsrc apps include) - ADD_SUBDIRECTORY(${SUBDIR}) - ENDFOREACH(SUBDIR) +-foreach(SUBDIR libsrc libcharls apps include) ++foreach(SUBDIR libsrc apps include) + add_subdirectory(${SUBDIR}) + endforeach() --- a/dcmjpls/libsrc/djerror.h +++ b/dcmjpls/libsrc/djerror.h @@ -24,7 +24,7 @@ @@ -54,7 +54,7 @@ Author: Mathieu Malaterre result = DJLSError::convert(err); if (result.good()) -@@ -1055,7 +1055,7 @@ +@@ -1071,7 +1071,7 @@ size_t bytesWritten = 0; @@ -68,10 +68,10 @@ Author: Mathieu Malaterre @@ -8,5 +8,5 @@ # make sure executables are linked to the corresponding libraries - FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm) + foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm) - DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd) + DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd) - ENDFOREACH(PROGRAM) + endforeach() --- a/dcmjpls/libsrc/CMakeLists.txt +++ b/dcmjpls/libsrc/CMakeLists.txt @@ -4,4 +4,4 @@ diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch index ad6e4de7..acbcec13 100644 --- a/debian/patches/03_datadic_install.patch +++ b/debian/patches/03_datadic_install.patch @@ -4,41 +4,58 @@ Forwarded: no Author: Mathieu Malaterre --- a/CMake/GenerateDCMTKConfigure.cmake +++ b/CMake/GenerateDCMTKConfigure.cmake -@@ -134,10 +134,10 @@ - SET(ENVIRONMENT_PATH_SEPARATOR ";") +@@ -114,15 +114,7 @@ + #endif() + + # Configure file +- +-# Windows being windows, it lies about its processor type to 32 bit binaries +-set(SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}") +-if(NOT SYSTEM_PROCESSOR) +- set(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}") +-endif() +-# CMake doesn't provide a configure-style system type string +-set(CANONICAL_HOST_TYPE "${SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}") +-DCMTK_UNSET(SYSTEM_PROCESSOR) ++set(CANONICAL_HOST_TYPE "Debian") + + # Configure dictionary path and install prefix + if(WIN32 AND NOT CYGWIN) +@@ -134,10 +126,10 @@ + set(ENVIRONMENT_PATH_SEPARATOR ";") # Set dictionary path to the data dir inside install main dir (prefix) - IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY) -- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic") -+ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\dicom.dic") + if(DCMTK_ENABLE_EXTERNAL_DICTIONARY) +- set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic") ++ set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\dicom.dic") # If private dictionary should be utilized, add it to default dictionary path. - IF(ENABLE_PRIVATE_TAGS) -- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic") -+ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\private.dic") - ENDIF(ENABLE_PRIVATE_TAGS) + if(ENABLE_PRIVATE_TAGS) +- set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic") ++ set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\private.dic") + endif() # Again, for Windows strip all / from path and replace it with \\. - STRING(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}") -@@ -155,10 +155,10 @@ - SET(ENVIRONMENT_PATH_SEPARATOR ":") + string(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}") +@@ -155,10 +147,10 @@ + set(ENVIRONMENT_PATH_SEPARATOR ":") # Set dictionary path to the data dir inside install main dir (prefix). - IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY) -- SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic") -+ SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/dicom.dic") + if(DCMTK_ENABLE_EXTERNAL_DICTIONARY) +- set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic") ++ set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/dicom.dic") # If private dictionary should be utilized, add it to default dictionary path. - IF(ENABLE_PRIVATE_TAGS) -- SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic") -+ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/private.dic") - ENDIF(ENABLE_PRIVATE_TAGS) - ELSE(DCMTK_ENABLE_EXTERNAL_DICTIONARY) - SET(DCM_DICT_DEFAULT_PATH "") + if(ENABLE_PRIVATE_TAGS) +- set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic") ++ set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/private.dic") + endif() + else() + set(DCM_DICT_DEFAULT_PATH "") --- a/dcmdata/data/CMakeLists.txt +++ b/dcmdata/data/CMakeLists.txt @@ -1,5 +1,8 @@ # declare installation files --INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data) -+SET(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}") +-install(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data) ++set(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}") + -+INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) -+INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data) ++install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) ++install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data) # add paths to the dictionaries to a CMake variable for being used by the unit tests - SET(DCMTK_DICOM_DICTIONARIES + set(DCMTK_DICOM_DICTIONARIES diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch index 6fab7dd1..964c29ac 100644 --- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch +++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch @@ -4,7 +4,7 @@ Date: Fri, 4 Jul 2014 12:02:51 +0200 Subject: [PATCH] Fixed OFoptional by introducing OFalign? --- a/CMake/osconfig.h.in +++ b/CMake/osconfig.h.in -@@ -1165,4 +1165,7 @@ +@@ -1180,4 +1180,7 @@ /* Define if we are supposed to use STL's system_error */ #cmakedefine HAVE_STL_SYSTEM_ERROR @HAVE_STL_SYSTEM_ERROR@ @@ -14,7 +14,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign? #endif /* !OSCONFIG_H*/ --- a/config/aclocal.m4 +++ b/config/aclocal.m4 -@@ -1953,6 +1953,47 @@ +@@ -1971,6 +1971,47 @@ fi ]) @@ -64,7 +64,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign? dnl This macro checks if a given preprocessor symbol exists and is a string --- a/config/configure +++ b/config/configure -@@ -16752,6 +16752,66 @@ +@@ -16924,6 +16924,66 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch index 112eb21b..0e46fec7 100644 --- a/debian/patches/05_performance.patch +++ b/debian/patches/05_performance.patch @@ -5,7 +5,7 @@ Author: Sebastien Jodogne Last-Update: Fri, 15 May 2015 16:39:01 UTC --- a/dcmnet/libsrc/dul.cc +++ b/dcmnet/libsrc/dul.cc -@@ -1897,7 +1897,7 @@ +@@ -1916,7 +1916,7 @@ msg += OFStandard::getLastNetworkErrorCode().message(); return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); } @@ -16,7 +16,7 @@ Last-Update: Fri, 15 May 2015 16:39:01 UTC * Disable the so-called Nagle algorithm (if requested). --- a/dcmnet/libsrc/dulfsm.cc +++ b/dcmnet/libsrc/dulfsm.cc -@@ -2461,7 +2461,7 @@ +@@ -2476,7 +2476,7 @@ msg += OFStandard::getLastNetworkErrorCode().message(); return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); } diff --git a/debian/patches/07_dont_export_all_executables.patch b/debian/patches/07_dont_export_all_executables.patch index dd1d9c72..f15623b2 100644 --- a/debian/patches/07_dont_export_all_executables.patch +++ b/debian/patches/07_dont_export_all_executables.patch @@ -9,16 +9,16 @@ Author: Gert Wollny --- a/CMake/dcmtkMacros.cmake +++ b/CMake/dcmtkMacros.cmake @@ -60,11 +60,11 @@ - ENDIF(WIN32 AND NOT MINGW) + endif() # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property -- SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM}) -+# SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM}) +- set_property(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM}) ++ #set_property(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM}) # declare installation files, also export DCMTKTargets.cmake - INSTALL(TARGETS ${PROGRAM} + install(TARGETS ${PROGRAM} - EXPORT DCMTKTargets -+# EXPORT DCMTKTargets ++ # EXPORT DCMTKTargets COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR}) - ENDIF(BUILD_APPS) + endif() diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch index 688d0065..6f183e41 100644 --- a/debian/patches/08_remove_system_processor.patch +++ b/debian/patches/08_remove_system_processor.patch @@ -2,36 +2,3 @@ Description: Remove the systemprocessor name in the compilate Required for reproducible builds, and it is also not reliable Author: Gert Wollny ---- a/CMake/GenerateDCMTKConfigure.cmake -+++ b/CMake/GenerateDCMTKConfigure.cmake -@@ -114,15 +114,7 @@ - #ENDIF(VTK_USE_ANSI_STDLIB) - - # Configure file -- --# Windows being windows, it lies about its processor type to 32 bit binaries --SET(SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}") --IF(NOT SYSTEM_PROCESSOR) -- SET(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}") --ENDIF(NOT SYSTEM_PROCESSOR) --# CMake doesn't provide a configure-style system type string --SET(CANONICAL_HOST_TYPE "${SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}") --DCMTK_UNSET(SYSTEM_PROCESSOR) -+SET(CANONICAL_HOST_TYPE "Debian") - - # Configure dictionary path and install prefix - IF(WIN32 AND NOT CYGWIN) ---- a/CMake/dcmtkPrepare.cmake -+++ b/CMake/dcmtkPrepare.cmake -@@ -376,11 +376,6 @@ - OPTION(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF) - MARK_AS_ADVANCED(DCMTK_FORCE_FPIC_ON_UNIX) - -- # Setting for IA64 / x86_64 which needs -fPIC compiler flag required for shared library build on these platforms -- IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND DCMTK_FORCE_FPIC_ON_UNIX) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") -- ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND DCMTK_FORCE_FPIC_ON_UNIX) - - ENDIF(WIN32) - diff --git a/debian/patches/series b/debian/patches/series index 17b50fc4..f13541ae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ 03_datadic_install.patch 04_Fixed-OFoptional-by-introducing-OFalign.patch 05_performance.patch -06_soversion_abi.patch 07_dont_export_all_executables.patch 08_remove_system_processor.patch 09_fix_format_on_32bit.patch -- 2.30.2